Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release branch to develop #2434

Merged
merged 58 commits into from
Apr 5, 2023
Merged

Release branch to develop #2434

merged 58 commits into from
Apr 5, 2023

Conversation

MatusKysel
Copy link
Collaborator

Purpose

How does the solution address the problem

Changes made

rattrap and others added 30 commits February 6, 2023 19:48
@rattrap
chore: adds current balances from eth ERC-20 token, staking contracts…
61ae5cf 
… and claim contract
@justinsnapp
chore: change tetsnet timestamp to Tuesday, February 7, 2023 1:20:06 …
ecd746a 
…AM UTC
@MatusKysel
chore: fix possible reason of crash on testnet
4364c5c
@MatusKysel
Merge pull request #2314 from Taraxa-project/graphql-fix-4-testnet
29dfb3b 
chore: fix possible reason of crash on testnet
@JakubFornadel
fix: use correct round when checking reward votes
11756ab
@JakubFornadel
Merge pull request #2316 from Taraxa-project/fix_reward_votes_round
a531356 
fix: use correct round when checking reward votes
@JakubFornadel
Merge pull request #2335 from Taraxa-project/develop
b603fc8 
New release
@JakubFornadel
chore: change timestamp to Monday 20. February 2023 15:00:00
7b96e24
@MatusKysel
chore: increase net version
cb437b6
@rattrap
chore: new testnet mirroring genesis file
3e7a563
@MatusKysel @rattrap
chore: use old version of conan
dba9fe1
@rattrap
Merge pull request #2353 from Taraxa-project/testnet_20230228
1500374 
Testnet 20230228
@MatusKysel
chore: introduce check on double votes
9a2b67f
@MatusKysel
Merge pull request #2390 from Taraxa-project/fix-for-double-votes
25c65e2 
chore: introduce check on double votes
@MatusKysel
increase net version
5f8a7b7
@rattrap
Merge pull request #2391 from Taraxa-project/increase-net-version
c7df53b 
increase net version
@rjonczy
remove rpc nodes
9e89f72
@mfrankovi
fix: vote bundle processing
6e73eb2
@rjonczy
Merge pull request #2395 from Taraxa-project/rew_votes_sync_fix
a857564 
Reward votes sync fix
@rjonczy
Merge pull request #2393 from Taraxa-project/chore/remove-rpc-nodes
08a29de 
remove rpc nodes
@mfrankovi
fix:reward votes broadcast
7ccdd5a
@justinsnapp
Merge pull request #2396 from Taraxa-project/rew_votes_period_chk
14dcbd9 
Reward votes round check
@mfrankovi
chore: rebroadcast votes based on period not round
f206828
@MatusKysel
chore: check for double PBFT votes in proposed blocks
d5cc15b
@JakubFornadel
Merge pull request #2398 from Taraxa-project/votes_broadcast_on_period
4898774 
chore: rebroadcast votes based on period not round
@JakubFornadel
Merge pull request #2402 from Taraxa-project/check-on-double-votes
398b1dc 
chore: check for double PBFT votes in proposed blocks
@JakubFornadel
chore: remove taraxa_devs account from mainnet
a1136bc
@JakubFornadel
Merge pull request #2407 from Taraxa-project/mainnet_remove_taraxa_de…
d9db071 
…vs_acc

chore: remove taraxa_devs account from mainnet
@MatusKysel
chore: update dpos contract
ea8b505
@MatusKysel
Merge pull request #2416 from Taraxa-project/testnet-dpos-update
0c5ddee 
chore: update dpos contract
MatusKysel and others added 20 commits March 30, 2023 09:25
@MatusKysel
chore: move dag lvl mapping update to final chain
e981ba8
@MatusKysel
chore: update evm submodule
ab882f5
@MatusKysel
chore: remove precommit_ext
bfc4391
@MatusKysel
chore: fix typo
ddd246e
@MatusKysel
Merge pull request #2423 from Taraxa-project/testnet
21858f2 
Testnet
@kstdl
Merge pull request #2424 from Taraxa-project/adjust_gas_limits
4c96577 
fix: make gas limits smaller for all of our networks
@MatusKysel
Merge pull request #2425 from Taraxa-project/final-chain-fix
20498c7 
Final chain fix
@kstdl
chore: update evm submodule
0097690
@kstdl
chore: update evm submodule with added amount to claim logs
7d3fab3
@kstdl
Merge pull request #2426 from Taraxa-project/dpos_claim_amounts
050b84e 
chore: update evm submodule with added amount to claim logs
@rjonczy
update IDs of bootnodes
539a61a
@rattrap
Merge pull request #2427 from Taraxa-project/fix/keys-change
9340084 
update IDs of bootnodes
@rjonczy
change initial_validator keys
abf6dff
@rjonczy
Merge pull request #2428 from Taraxa-project/chore/initial_validators…
a1cad1a 
…_keys_change

change initial_validator keys
@rattrap
chore: mainnet reset genesis block
15253ee
@rattrap
chore: mainnet reset version
9e482d0
@MatusKysel
chore: fix GetDelegations reward value
bc90f17
@MatusKysel
update version to 1.2.1
0f0f05d
@MatusKysel
Merge pull request #2430 from Taraxa-project/mainnet-1.2.1
8eb5b49 
Mainnet 1.2.1
@MatusKysel
Merge branch 'develop' into master-merge
455347e
@JakubFornadel JakubFornadel added this pull request to the merge queue Apr 5, 2023
@JakubFornadel JakubFornadel removed this pull request from the merge queue due to a manual request Apr 5, 2023
@JakubFornadel JakubFornadel merged commit fee3edc into develop Apr 5, 2023
@JakubFornadel JakubFornadel deleted the master-merge branch April 5, 2023 17:44
@taraxadeploy
Copy link
Collaborator

prnet cleaned-up successfully

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kstdl kstdl kstdl approved these changes

@JakubFornadel JakubFornadel JakubFornadel approved these changes

@mfrankovi mfrankovi Awaiting requested review from mfrankovi

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@MatusKysel @taraxadeploy @JakubFornadel @kstdl @rattrap @justinsnapp @rjonczy @mfrankovi